bitkeeper revision 1.1159.45.6 (41252db4n6kL4UwbrIkk3U5CrBJ4Qw)

We still need force_max_zoneorder 11 in 2.4.26

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index c548c71ccafc0582775519d9cb8b4d672255d001..98eb5b8337f0e53196690978f042f23b0405943b 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -35,6 +35,7 @@ linux-xen-sparse
 patches/*
 tools/*/build/lib*/*.py
 tools/balloon/balloon
+tools/check/.*
 tools/misc/miniterm/miniterm
 tools/misc/xen_cpuperf
 tools/web-shutdown.tap

diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.26-xen-sparse/arch/xen/config.in
index daed22d5432421d4dcb5525ddccf3b5e843db120..8fa004a16b0f933be587832accc138044cbdb09b 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/config.in
+++ b/linux-2.4.26-xen-sparse/arch/xen/config.in
@@ -106,6 +106,8 @@ if [ "$CONFIG_HIGHMEM" = "y" ]; then
    bool 'HIGHMEM I/O support' CONFIG_HIGHIO
 fi
 
+define_int CONFIG_FORCE_MAX_ZONEORDER 11
+
 #bool 'Symmetric multi-processing support' CONFIG_SMP
 #if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
 #   define_bool CONFIG_HAVE_DEC_LOCK y

diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0
index c51c2210b4cdcd3b221f5dac853b20d9b31c4e27..06ae1e972c25ec5a70b8a9c2387cec9cf59d73fc 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0
+++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0
@@ -51,6 +51,7 @@ CONFIG_X86_TSC=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
 
 #
 # General setup